Removed file size restriction, added messages for OutOfMemory