Final edit for sure