Changed around some settings