Final changes, hope it works! :P