Update1

Tip position mapping improved