jtsalomo Upped Version