Improved design, added profile filter