updated with variable check