latest working changes