change monitoring part for more flexibility