*fixed setup again