Updated Mike's changes to 4_0