Edit2 cantik
huge improvements