More content added and some useless sections removed