Fixed stuff
slowing stuff down