beacon added and polished