Committing Updated the Framework files with some feedback from ARP use
Merge feature/FeedbackUpdate to develop