Editing works, need to make it better