Modifications on detect
merged fixed