got rid of type map