Added proper listeners and some plans