replaced commands with predefined vars