Added function to make standalone