Added clint branch changes