Reworked some stuff to make things more clear