Kan Ouivirach Merge solution back into main branch