Version 3.5.2 Tyr modfied