... and make it safe