now we save the context aswell