new 16, 17, 18, 37, 45 & added module in 24 (needed for tasks 37-39)