Update for lib loading
Update for time advance (in progress)