Updated for the recent changes