merging skeleton with master code