Remove duplicated code
Allow area selection