added internal & external support