diff --git a/README.md b/README.md
index d2bd086..61776de 100644
--- a/README.md
+++ b/README.md
@@ -1,50 +1,85 @@
- [![Codacy Badge](https://api.codacy.com/project/badge/Grade/02344df4eea34ed98249040aea7eb10b)](https://www.codacy.com/app/anupam/PopularMovies?utm_source=github.com&utm_medium=referral&utm_content=opticod/PopularMovies&utm_campaign=Badge_Grade)
+[![Download Opti-Movies](https://a.fsdn.com/con/app/sf-download-button)](https://sourceforge.net/projects/opti-movies/files/latest/download)
-# PopularMovies
+# Opti-Movies
-Here is a fully functional and user friendly android app which I made from scratch for [Android Developer Nanodegree](https://www.udacity.com/course/android-developer-nanodegree--nd801) program.
+Old name: **Popular Movies**
-This app help users to discover the most popular, the highest rated and the highest-grossing movies.
-It reveals the power of adaptive UI both for phone and tablet devices.It includes various new Lollipop+ features.
+Here is a fully functional and user friendly android app which I made from scratch for [Android Developer Nanodegree](https://www.udacity.com/course/android-developer-nanodegree--nd801) program.
-Popular Movies was highly evaluated by certified Udacity code reviewer and was graded as **"Exceeds Specifications"**.
+This app helps users to discover various categorised **Movies** and **TV Shows**. It reveals the power of adaptive UI both for phone and tablet devices.It includes various new Lollipop+ features.
-![Popular Movies](https://github.com/opticod/PopularMovies/blob/Stage2/extras/feature_graphics.png)
+The app was highly evaluated by certified Udacity code reviewer and was graded as **"Exceeds Specifications"**.
-#Features
+![Popular Movies](https://cloud.githubusercontent.com/assets/13851773/21468860/a4aa1060-ca51-11e6-8e39-59ceb041f55a.png)
-With this app, you can:
+## Features
-* Discover the most popular, the highest rated and the highest-grossing movies
-* See their ratings,popularity,release date,genere types
-* Save favorite movies locally to view them even when offline
-* Watch trailers
-* Read reviews
-* Sharing movie details with your friends
+With this app, you can discover
-#Demo
-![Popular Movies](https://github.com/opticod/PopularMovies/blob/Stage2/extras/animated.gif)
+- **Movies**
+ + Now Playing
+ + Popular
+ + Top Rated
+ + Upcoming
-See More at:
-[YouTube Demo 1](https://youtu.be/YoyXolO2hhU)
-[YouTube Demo 2](https://youtu.be/uHlaXrYLm6s)
-[YouTube Promo Video](https://youtu.be/STsHnjp1jKk)
+- **TV Shows**
+ + Airing Today
+ + On The Air
+ + Popular
+ + Top Rated
+
+For a particular **Movie** you can
+
+* See its *overview*, *rating*, *popularity*, *crew* and *cast* info, *genre*, *status*, *release date*, *original language*, *runtime*, *homepage*, *budget* and *revenue*.
+* Watch various official *teasers*, *trailers* and other *promo launched videos*.
+* Read other user's *review*.
+* Get suggested *similar* movies.
+* Save *favorite* movies locally to view them even when offline.
+* *Sharing* movie details with your friends.
+
+For a particular **TV Show** you can
-#Libraries
-* Square's Picasso
-* Square's Okhttp
+* See its *overview*, *rating*, *popularity*, *crew* and *cast* info, *genre*, *status*, *original language*, *runtimes*, *first air date*, *last air date*, *network*.
+* Get details of every *seasons* and *episodes* of it.
+* Watch various official *teasers*, trailers and other *promo launched videos*.
+* Get suggested *similar* tv shows.
+* Save *favorite* tv shows locally to view them even when offline.
+* *Sharing* tv show details with your friends.
+
+## Demo
+![Opti Movies](https://cloud.githubusercontent.com/assets/13851773/21468871/032d413e-ca52-11e6-8608-b5e0a7a1de8b.gif)
+
+See More at:
+[YouTube Promo Video](https://youtu.be/rJ4zrH6say4)
-#Development Setup
-This app uses The Movie Database API to retrieve movies. You must provide your own API key in order to build the app. When you get it, just paste it to: _app/build.gradle_
+## Development Setup
+This app uses The Movie Database API to retrieve movies. You must provide your own API key in order to build the app. When you get it, just paste it to: _app/build.gradle_
![Image of TMDB](https://assets.tmdb.org/images/logos/var_1_0_PoweredByTMDB_Blk_Antitled.png)
-#License
+## Project License
+```
+Copyright (C) 2017 Anupam Das
-Copyright 2016 Anupam Das
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```
+## Other open source Licenses
+### Android source code
+```
+Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -56,4 +91,20 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+```
+### Square Picasso
+```
+Copyright 2013 Square, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```