finished adding Maurizio's features and plotting