Changes for Revision 0.4