Somewhat clearer naming added