made it prettier v1