Added new delegate and removed unused methods