finished implementation of new EFS and common corner treatment