undid latest changes due to problems (to be re-done later)