Changed public stuff