Transferred to use as a class