Removed errors, in final stage