Some tweaks :)