Added additional code, refactoring some data later