Added some app logic, Must Be fix