modified and working but not DRY and assert is off