modified setup way