input filter added, other methods changed