Small Update v.1.2