making it less buggy