Govt still working to 2021 budget surplus