todo added
minor renaming, grep and regex added