Moved methods arouna dn added pragma marks
removed import recieved indirectly