More work on compact version.