Minor alterarions