latest changes

sorting and filtering yet to be done