Version 1.5 Added Filtering and Sorting