All of the extraneous 2nd function removed