added z-s conversion