Added linear combination and first option of activation function