Made basic changes