Getting all these changes committed to the main branch