initital add after merge from github