Few changes Dec17