Committed

Changed some stuff