Applied Simons initial checkin, first slightly modifications