or and comments update