merging code together