some changes from real app