Changed how beacon change callback happens, bugs