Adrian's joysmooth stuff

Adrian's joysmooth stuff