added a lot of rescure stuff