code fix(less laggy)