some minor updates for testing purpose