commit #2 from desktop