Added teh stuff that was requested