tweaks suggeste by @petertheyeti