Added miki's stuff