Develop

Fixed scope and delegate issues