improved solution to check on sotrage list