changed a few things around