Update cuztom
Setup for tip position
Update cuztom
Merge branch 'dev'