updated for current libs