Added correct solver, simple generator & borders