first try at integrating nolan's content