Update to Master - (fix cursor I hope)