Small optimization of shape:360