changed a few things to make things giggly