Reverted last commit, better use filter pattern?!