changed structure to notebook based