fixed up setup