Added modified files to latest smart version. I'm trying to make Alyce's life better here so she doesn't need to solve millions of conflicts. If any problem occurs, contact will.