little change to what yazman did.