Adding returns for completeness

Adding returns for completeness. Fullproofing