Working on Application simplification