working version 2 - settings working