added all mapped stuff