axing dynamic in some places it ought not be