Continuing working on Detector