revert last commit, major issues