Working on 'rebuild' command