Removed dependency on Systen., added solution