[BUGFIX] adapting to new specs