Major changes to settings and submission