Better naming, fixed overlay