Added tracking, removed demo features