Updated simply to handle signs