implemented lag
did stuff
merge