Enhancements

KINS 488 Enhancement can be found here.