wip
res
updated for new year