Made puck a singleton