Add timeout to on_modified, so its faster. Cleanup!