Corrected a bug with the delegate methods
Deleted old versions