UPDATE: added settings