Improved beam detections. Reached a dead-end after trying all possible combinations. New method to come up