worked around all the bugs!