Changes from 'Shark64'