cleaned the inhirttance again, based on new ideas of working