moved a bit more the things around