Adapted version changes to stay at 2.1