Updated with 3 axis