Done initial code changes