add some code and stuff to make it better