Revert "Removed code, fixed limit and from + new example"

This reverts commit 9db0715b0923246a71d464758f0c233c55817edc.