Reimplement initial solution