improvements for wk 3 class