Added limits and sstuff