Merge "update Brightness logic"