modified for April 14 3W(with fixes)