LAI-1 added scheduled activity extraction ranges, code clean-up