Changed some stuff for testing