Remake/part 2 of my last edit