Task3b Sort of fix