New implementation is working