Still tweaking for jenkins