fixing up setup