working application after some changes