Added listener functions. On going work.