Slight modifications (mostly trash)