adjusted var naming and added a wide wrapper option