Added filtering and a one-step run script