Improve manor auto start