ive been trying to improve doe... :(