updated patricks stuff