furhter tweaks