major simplification and good start to editing