Cleaned up the newest model