just few little tweaks