Make capturing a seperate stage