include more stuff from stock

taken from p720