changing initialize
 fixed Merge conflict