Added comments fucntionality