var rename for future rewrite