Updated code to reflect earlier changes