working version without tracking