Some initial code changes