Somne changed not working properly yet