Added input interaction and filters