Improve cloak mode