more dynamics. needs to make up fixes