modified by jay