Made the static portions dynamic