changes for running in phone(not important)