Simplified the code, still serial