here is wha I have done since the last commit