(re)moved some functions