adapting fs to new style