Had more simple changes