A changed a few things