slightly less buggy