master small logic modif