2nd problem + renames