Added more code

Done...please review