904 rebuild/swap advice