first commit
second commit
fixed minor errors