initial commit
adapt changes