adding multi dev support