updated for funness