Hopefully final changes for initial submission