changed all redundant setup