Modified comments & implementing functions