UPDATED: some settings