Final commit after review