Update tweeks and structure.