this should be done with plugin