Updating with expected behavior (to implement).