Tried to improve i dont remember now what