I tried to make it bettererer