Now all working. Fixed handle positioning bug