Adds z and removes some dupe declarations