added some commits, I didn't understand my own code anymore