Added general solution