add solution for easier editing