Removed unnecessary maps. Added interraction.