Added active and end