fixed leading / lagging logic. again.