Updated roundhouse with more parameters