Added settings. untested (lazy me =P)