lots of refactoring
update git
call works