added some apply_filters
WIP