replace everything with new resource framework