Cleaned up for final submit