revamping whole application