added filtering of data
little edits