revamp of first commit