Removed top and bottom check - they were redundant