Removed hard coded limit.