adding handling for some cases of format 2