Updated to match new concept.