Total time improvement, stripped a thing that bugged me