added map (not finished)