Feature/mod

is it right?