implemented some edge stuff v2