Merge with Behnam's std_v1.1