added sorting, need to fix colors