post calc improvements as week10