Updated to reflect clarifications