make this less buggy