Made frame limiting optional