updated for new setup