Updated with new framework