Small Fix and Set Time Working