Changes to differentiate from base code