Updated with code filled into the stub files