removed address checking