Remake of one of my old edits;probs the last edit too