update to Common.c