roll back last commit changes due to several bugs