Some changes to rock2