Changed to common listener and added police functionaltiy