fix order
add support for axis