agree. it should be a standalone target if possible.