Add few tweeks