Working on detection-part