Renaming
Renaming
Simplify
Simplify
Simplify
Change definition of HasPosition

Close #314