rewrite with storm orm