added settings (marked as TODO)