Now using proper Flancter instead of hack