more working changes