Changed some Methods