Added $ signs
removed old selection model