some length changes made