16, cleaned up