my changes and some cool gems