added filter option, switched to thor