updated for 5.2