some working changes

committing to save the state