Version 4.1

More homeworks...