put back a couple of things that were removed - sudar's inline suggestions