A lot of changes and testing around