added custom setup