The ministry of the Holy Spirit is in total unity with the ministry of the Holy Spirit. The two great gifts, which Christ gives to His people, deal with the removal of sin and the bestowing of or the baptizing with the Holy Spirit. The baptism of the Spirit is an unifying factor of all believers immediately at their conversion. To use the terminology 'baptism by the Spirit' as a post-conversion experience is not biblical theology, it actually leads to chaos and divisions. To live a Spirit-filled life is normal for the christian, it's obligatory not optional.