Passes System Tests - could be neatened by removing duplicated code