Final edit finally