Writeup - Implemented Olivia's improvements