Fuctionalize and add comment