Fixed maps and added F3