Re-testing 4,8 with full space and refactoring Most