Worked on ZehnK layout. Included new helper methods