Recombined with my stuff and formatted