Updated bits and bobs
Deleted as result of rename