updated this to the new setup