refactoring + initiate on start feature