Changed some functionality