Modified delegate and introduced another
Modifications to match pep8