This paper discusses the concept of take-over (TO) in conditionally automated vehicles. Most of the current studies consider TO as a discrete event that is completed when the driver takes full control of the vehicle. Two problems with this approach are that the driver 1) needs time to gain sufficient situational awareness and 2) sometimes takes over only the lateral or only the longitudinal coordination of the vehicle, neglecting the other. To overcome these two problems and increase the quality (effectiveness, efficiency, and satisfaction) of TO, we propose two new approaches to the take-over process: partial take-overs (PTO) and assisted take-overs (ATO). The proposed PTO approach allows the driver to take over only the lateral or longitudinal coordination of the vehicle separately, instead of assuming a full TO. With ATO, the driver is monitored even after taking control of the vehicle and is assisted with automatic soft braking as well as additional warning and emergency braking if the time to collision falls below the appropriate critical levels. The approaches were evaluated in a user study with 44 participants in a driving simulator. We were able to confirm that the proposed ATO approach significantly improves the TO quality in terms of both effectiveness and efficiency without compromising driver satisfaction. Contrary to our expectations, the PTO approach did not have a significant effect on the effectiveness of TO, but only provided significantly lower reaction time to first braking and longer time to lane crossing. When combined, ATO and PTO were at least as useful as either approach individually and should be considered in future TOR user interfaces.