Changed some basic elements