made it work and faster