Adding a remote question & some code refactoring