app working before this commit