added additional fun stuff