1st update from Monash. Simplified code, not working.