130514 + made timer check
             - cleaned some comment out