First tweaks to make it mine