Merged some code -- Develop