addressing crashes due to some buggy code, gpt idea was not great :D