It finally works like it should