Some changes, and added manual pack