Added ability to switch drugs