20140103 logic change