final commit, buggy final version