minor changes. should be removed