updated for _s 1.3