Final version commit after testing