minor changes, now in shape for testing