Update for jenkins and for testing :)