Improved(?) spacing