Improve or new approach?