first draft of tweaks