rework class McLaut