minor changes so its not dependent of internall stuff