Final commit for future development