Added more tweaks