first local commit
improves context, adds filters