BUG:  Not taking account of vol.