Added new impl, gonna remvoe old one