followed suit, from code defined at other places. Since it's also bit faster.