Improvement to be like other apps