last commit before I try to restructure the code