Acceptor updated
Merge branch 'DevelopmentThomas'