Bringing it up to date with 3.0.1 and new settings