Added support for capture now