Just couple small tweaks