WIP: Added seconds difference logic