Use seperate branch for each device in future