fixed up type a bit