reworked alignment