Added starting method
Minor improvements