Added formatting & filtering data