added tracking and in/out feature