Updated to the latest gagarin pacakge