Modified to use the corrected current_time source