updated for upcoming release