Changed stuff to make it better
Merged with master