Added my own filter and map functions