Latest updates for testing