removed pointless wrapper functions