Added wrap and minor adjustements