Added basic Z stuff