Final edit. Everything good to go