Fuck my life for not commiting on time.. Lost last code and rewriting it again...

Signed-off-by: Simarpreet Singh <simar@linux.com>