Updating my master with the g-snakes