Resolved all errors