added expand.defer functionality
added expand.defer functionality