final commit

Seems to work as supposed to :D