Cleaning up commented code.
added user_id to results