using upstream version
added some data from the RASMUS book