Fixed bugs with my code use this version now