updated to remove unnecessary init