some changes to fix settings problem??