Removed redundancy in observer cases