added axis and other stuff