More definition of done tweaks