Temoaraly removed -h, need to rethink it