updated descriptions and merged two files