removed some duplicate lines