Updated for current setup