Added comments and added feature