first commit
need to change and test