updated version 1.2