Fiddled with sizes for #58