changed some stuff to make it more awesome