Added Size Check instead of Manual