Removed potential lag issues