first commit with some bugs