My initial tweaks