Adding new code to allow dynamic changes