merged changes for status.c