Better setup; Updated settings