Combined 1st and 2nd Factory and moved to Wong-Noi