A whole lot of changes added