Solution revamp