Revision 1.1 - Fixed Sorting and timestamp formatting