added settings, will revise later