MODIFIED: minor changes