initial working changes
working changes