9.00 pm update, merging the code