Updated creating factory, created joining factory