Bug Fixes.  Transforming in correct order.