Some alterations in delegate methods