Added beta location checking