removed catch functionality + tweaked numbers