Various changes and update for 25th Jan.