Added availabilty checking option