Refined edit

Few more options
Code reviewed
Re-try compatible