Some minor adjustements :)