merge work from Feb.25