going through everything making changes...