Missing from previous checkin
Incorporation of Maverick code