Fix code and add overlay