updated to use new scribble features