2015+ Shortblock swap