Initial vertical tightening for #286