Huge markup update