committing my changes
mixed code