Massive Re-do

Signed-off-by: ayysir <dresadd09691@gmail.com>