Chapter #1 improvements