more dynamic improvements