still fixing settings