12-10-13

Added some listeners