Added rise-time stuff