Removed unncessary delegate method, added property