Updated to design from Zbynek