Version 2.0, added all possible inputs, connection properly terminates