I'm sorry, it's been a while since I worked on this.
I had some changes, but I don't remember what - I do remember
implementing a loading gif screen.