more progress on the main branch