Made few changes, added new code..