Minor adjustments, improved repositioning