+1 to OP's suggestions