start fixing prewaits