remove rescue for now b/c it isn't working