final commit, with bugs