removed some goofy redirections. easier for serialization