copying over work from before