more changes...
Revert "more changes..."

This reverts commit e29f7cdeb4b9d9ffdab0d485e0229f3d34efb03a.
Revert "Added tracking to user selection"

This reverts commit 61868fc820b5d6e5513f7bc0b1ddcbac79d7818d.