Few changes added by Jos