NOT SURE ABOUT THIS COMMIT... it has been too long, but I really have to push the code