some solid changes