Improve initial task