Major changes, methods added, variable updates added