Updated for new setup