Changes to get this sucker usable