Need to make app size smaller