Updated == throughout for consistency