Updated with Z direction