Changes to make workable with hardware