added working changes