added parsing of variables