started modifying alignment for resolution of #30