Bug fixes, not working, fixing delegate