Fixing Task4