added place limit & more