updated editing... under dev