fixed axis bug
improve performance