now with more active resource and less DIY