Changing some stuff for less lagg (still some)