Changed the code so that we do not overwrite the default code anymore.