first go at the main patch