Exercise extended

Improved bugy program.