Edits to main framework class