more edits for new vesion