problems with legacy mode, will fix tomorrow