Changes to deal with mountain lion