Changes after feedback from @simplay