remake of an old edit (￣∇￣)