Problem: RFC was broken

Solution: Rewrote it to the current implementation