Added conversion system & fixed removeall