updating master with my changes