Added #17 and reworked number 23