still updating june draft