added filtering and modified timline