did some changes to Core with suggestions by chatgpt