Resolved all issue minus build