Reverted Tele to old bucket functionality; auto