Added detect system for future use