Moved code to deliverable2