Newer code as written

during the meet week