added public stuff