commit
commit
commit
updated for assumptions