removed soft limits TEST THIS AND MERGE