General:
Got rid of the jars finally!