Demands updated to match wiki requirements