merging ales stuff into main