fixing and enhancement (IP, Area)