added addentity again -,-
added second wrap