Finishing up Leonard Request

Last for this batch of Leonard