Modification to base code.