updated with additional functions
updated pages to use new Manager classes