Updated functions contents

Validated contents of the functions.