changed maps from static to embedded