Rebasing, updating, enabling java 6