Fixed singleton - moving ahead