corrected mapping, still need to secure it