Updated to allow for filtering; submission