Improve and detection