Changes after move to htoad