re#2  more changes here