some changes to fix collision... which dit nothing...
Merge
Love package