made the basic changes