Replaced code to build current unix time with a better one