added wrap feature