Fixed singleton issue, wrote more