changed a few things >.>