Add Z and change prompt