added mock_draft variable, fit somewhat improved