committing everything again -final