Improve behavior and use public server