Updated to comply with the new markers in RC9