Completed fjw -> basic map