Add Clock and Re - arrange