re-struct(test may not run);