More Changes, after Delegate Fix
more changes