Some improvements :)