My second edit, still sucks