787 Rework

feel free to vote for the request here