Added improvements from 100015 case