fixded setings
updated description
updated tracking method