1.3.5 Update

+ 300 lines