Changes from feedback. Attempts at improving performance, hooking in filters