added funcitonality to some listeners
-_- mac ds store