first commit
little modified