added new features and better app name solution