Added axis-order handling and changed compositing
Added axis-order handling and changed compositing