FIX for issue 15, added verification commends