Variable handling fully in place