Updates to accomodate wake [] in variable nammes