few changes hurr