- brought changes from the HappyStreet branch