ticket:3 Changed settings a bit