lot of changes
added limits