added some flobi-support