Old methods re-added because still in use in not yet committed class