modernized addon impelmentation