[IMP] Improved code to make it working for unlimited seats