updated to new versions