added few tweaks