Updated to new versions