update in progress
update in progress. new settings implementation nearly done