Add function, update comments