Some capture() changes