Moved code from single pg constructor