Changes on GRUNT