Changed some of the function names and added Simple Target Selector