added quit and poitns
merge conflicts