an attempt to make the app faster?