Resumed working code see 18 may