updated with mode: basic and extended
fixed to extended