update with chris stuff. remove map